Add an accessor for GdkImage->mem

See bug # 522756

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index e63d92d5e943abee48b514ac4c20cece3acf58dc..e09e887dd3f7bcd3652ddd258f737a51d9d9aaf1 100644 (file)
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -295,6 +295,7 @@ gdk_image_get_height
 gdk_image_get_image_type
 gdk_image_get_visual
 gdk_image_get_width
+gdk_image_get_pixels
 
 <SUBSECTION>
 gdk_image_put_pixel

diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index 5dc69280f304a66b2fada3dae5d43c4cea055321..15e328a5da5ddf0cff73fbd1bedd9d7f4ef51e94 100644 (file)
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -851,6 +851,7 @@ gdk_image_get_height
 gdk_image_get_image_type
 gdk_image_get_visual
 gdk_image_get_width
+gdk_image_get_pixels
 gdk_image_set_colormap
 gdk_image_new
 #endif

diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c
index 7b04925ffbb768d89d3a16813ede79b3ecab7747..1ef49c996dff44583bf7c0732765079d94ef0db4 100644 (file)
--- a/gdk/gdkimage.c
+++ b/gdk/gdkimage.c
@@ -243,6 +243,24 @@ gdk_image_get_bits_per_pixel (GdkImage *image)
   return image->bits_per_pixel;
 }
 
+/**
+ * gdk_image_get_pixels:
+ * @image: a #GdkImage
+ *
+ * Returns a pointer to the pixel data of the image.
+ *
+ * Returns: the pixel data of the image
+ *
+ * Since: 2.22
+ */
+gpointer
+gdk_image_get_pixels (GdkImage *image)
+{
+  g_return_val_if_fail (GDK_IS_IMAGE (image), NULL);
+
+  return image->mem;
+}
+
 /* We have N_REGION GDK_SCRATCH_IMAGE_WIDTH x GDK_SCRATCH_IMAGE_HEIGHT regions divided
  * up between n_images different images. possible_n_images gives
  * various divisors of N_REGIONS. The reason for allowing this

diff --git a/gdk/gdkimage.h b/gdk/gdkimage.h
index 8106f0b2969154a5ab8b960f3d6c05e00421cd0c..52008018e09c7bc1f66f675f9324dc9ba0874059 100644 (file)
--- a/gdk/gdkimage.h
+++ b/gdk/gdkimage.h
@@ -118,6 +118,7 @@ guint16       gdk_image_get_depth          (GdkImage *image);
 guint16       gdk_image_get_bytes_per_pixel(GdkImage *image);
 guint16       gdk_image_get_bytes_per_line (GdkImage *image);
 guint16       gdk_image_get_bits_per_pixel (GdkImage *image);
+gpointer      gdk_image_get_pixels         (GdkImage *image);
 
 
 G_END_DECLS